updated pom
updated with major refactoring
updated and merged
prop files added