Re-arranging modules
test fixes