Transfer model/collection structures into separate files, begin working on client script