Rename project again and refactor accordingly
Update readme