Added views and controllers, moved assocations to models