Rename folder struct

Renamed folder structure.