Restructure working directories