Starting to refactor code, make it look nice
Update the Readme