Restructure directory to facilitate easier deployment