final restructure of file locations