new folder structure and tests