code cleanup. moving around modules