Restructured files to merge with MasDevelopment