Clean up

Cleaned up file structure for organizational reasons