Fix git commits

This branch fixes the multiple "delete all code, add all code" commits with proper git-based file renaming. It will need to be force-pushed over the current master. The code is 100% identical, but the git history is all intact as it should be.