Removed some files that should not have been committed
Moved some things around