Moved the files to a more normal directory..
Merge branch 'changed' into feature/auction

Conflicts: