restructure based on latest framework #3

Closed demonkillerr closed 8 months ago