Update project structure to multi project
Fix starting point of numbering offset