updated for new folder structure + tests