Refactored to FhskDemo/Site module