Moved files around...
Moved files around... and some deletes...
Merge branch 'restructure'