sorting out my dir structure