Architecture related changes.

Architecture related changes. Remove  Presentation Folder.