General Cleanup

Cleaned up many inconsistencies, made a more clear class structure,
started setting up the primary user interface.