restructure + fix
delete unused files