Almost all working now

Moved things around
Removed several files