Resolved class naming issues and modified README