start v2 - cleanup and reorganisation