Finished rearchitecture for version 2.0
Finished rearchitecture for version 2.0