Move MANIFEST to correct location
Move files to correct places

* Warning: There may be some breaking changes

Initial testing has been okay so far.
Merge pull request #295 from dreamteam69/master

Move files to correct places