Introduced new folder structure