more structuring, new packages/vanilla activity classes