okay fixed dir structure up a litel better