Refactor module naming and updating readme