Add some code and fix folder structure