Cleaning folder

Preparing for new project structure.