working organisation update
cleanup and updated to organisation model