Cleaned up structure

Moved some files around