simplify project structure and cleanup - but note, completely breaks everything
update readme