cleaned up poms
moved assembly stuff