* Changed the folder structure