put fixtures where should be
fix more imports
inherit from Resourcebase manager
some cleanup