refactor a bit, remove redundant has_one has_many & belongs_to association classes
bump version to 1.2.0