Migrated to new project layout