Totally reorganized project structure