Cleaned up code to being finalizing starter code
Reorganization and RME clean up