Put memory classes in other package
A lot of updates