[CHG] Renamed folder in project root folder for clean project structure