Formatting
This doesn't belong here
Better directory naming
Moving things around
Cleanup