Switched to module structure and made simple demo