Maintenance on the code

Moved, Refactored, Cleaned up code.  GUI work done as well.