change the folder structure for easy development and cloning