Move files to correct places

* Warning: There may be some breaking changes

Initial testing has been okay so far.