Renamed the folders for better semantics.