Updated Readme, finished refactoring