Midway through massive cleanup
reorganized package system
Refactoring Main
Refactoring pushed to repo