changed dir structure to be more composery