fixed melk subscriptions
some files renamed