further cleanup, getting rid of unused classes, next organizing the image resources