reording messed up repo
further repository tidying