revise application flow, remove unecessary classes, general redesign based on new concept