Restructure files
Update paths
Update vendor make files