refactored classes
more refactoring
moved view to lib
placeholder