added property file, and some refactoring