Refactor module structure
Update read me