Some refactoring and added eclipse files