some rearranging

Trying to clean up root dir