Updated dir structure to ease installation