Moved module parts to their modules