Changed the names of the folders to make them more explicit.