Organise code into folders
Fix paths