Renamed organisation to organization, remove unused entity, add fixtures