Subscription/Repository integration (at last:)

Unification of the .jsp substructure (step 1)