Moved stuff around into real module