Some more refactoring and added a README file for the project