Reorganized project structure
Fixes for the new directory structure