Moved UI (working) to main with many improvements. reorganized other classes.