Reorganization and Misc. File Cleanup