Changed package name and added properties file and tidied code