restructuring
cleaning up file changes