Move all the files to an other directory
Optimize imports
Refactored code