Took changes from original branch and reapplied just the correct folders