Change module structure
clean coding style