Simplify module structure for now.