Added support to organize  models in folders without breaking controller -> model association