Reorganization

Moved some top level files into sub folders.