Reorganize module structure