Redo directory structure
Fix git tracking for mved files