refactor
update changelog
update to new directory structure
refactor tests