major restructure of directories