Make models and controllers directory structure consistent