restructured some classes to a framework package (in the future migth be a separate project)