Added variable memory, used static variable in base class, perhaps ugly?
Rearanged files for vilibility
Rearanged fiiles for visibility