Restructure and remove directories