huge refactor 75% done
removed extra files