framework: Add reworked framework to repo