Changed the folder layout