heavy dir restucturing - in progres/broken build