Folder rearange and new base classes added