cleaned up and putt stuff in proper module files