changes structure, updated classes, added screen, fixed some bugs