Revert "Removing old folders."

This reverts commit 44d602a0750e042085ad95aa50ad3430b561493f.