Reorganized project structure
More structure changes