Cleanup orphaned files as a result of restructuring in master repository