started using new folder structure