Removed spaces
Broke things into a better file layout, started doing things the right way.