cleaning code and restructuring project files