dir structure cleanup
several fixes