Folder Structure

* Updated folder structure.