Finishing reorganization and making sure code compiles
12 files changed