Move files to correct places

* Warning: There may be some breaking changes.
* Initial testing shows no problems so far