Beginning re-org, move away from lib to models dir
Fixing test cases after refactor