#129 #126 Split Model code into separate static library. Removed unused files and added dependency to the new library