Hierarchy Changes

Changed system of folders