Altered dir structure to make life easier