solved 17
restructured lib classes to lib folder
started on 18