Make modules and controllers directory structure consistent