Changed the folder structure. Renamed some folder.