reduced code, added new folder structure