major reorganizing
cleaned up pom