[Master] Restructure directory tree