Flesh out basic structure, elim Activity & co

Tab/space differences make it hard to tell diffs, sorry!