Moved model classes from shared library to model package
Moved model classes from shared library to model package
Merged challenge class