Merge new structure from sample project