Basic reorg of directory
Commit before massive fucking around