cleanup
new program structure and updated gui