backup
simplify folder structure
update build system