Delete old framework code and move the refactor package to top level