Cleaning post merge remnants

POM had some merge problem, and moving newly added
stuff to their proper place