Started a few more models/tests
Updated package.json, some Organization stuff, better tests