Moved a lot to generic activity and presenter superclasses
Temp fix, to be removed later