Move batch related files under appropriate namespace