package refactoring, javadoc added
old files deleted