Moved models/collections into entity directory
Pluralised directories for better readability