Models and brokers moved to separate directories