Code cleanup, rearranging modules.