Deleted a bunch of unused php files. Moved register. Changed setup slightly.
Merge remote-tracking branch 'origin/Semi-final' into Semi-final