Major organizing and fixes
Major organizing and fixes