Reorganizing project file structure. Release v2.9