Work and cleanup
Modifications to how elements line up
Version and Modulexml Bump