Restructure to root directory