Refactoring tutorial model package
Bug detected in JadeConnector Issue 33 created