Restructured folders to match Master