Move files to proper directories. Change includes in tests for new layout. Stop adding extraneous files.