First POM clean up.

Does NOT compile yet.