Added option for multiple model directories
Conventions
updated docblocks
Added tests