moving usersubscription app and other fixes