Modularisierungszeug, GUI, minor changes

Still trying to figure some stuff out..!