some reorganisation
removed ~ files