Fixing specifications
Fixing modelSpec
Preparing model skeleton again
Revert "Preparing model skeleton again"

This reverts commit db75e8cbf64d663e1cca845c4a379cd020d504bb.