clean the code and use pascal case for files and folders