Fixed the file and folder layout