Implement the HWAF mode - cleanup from CMake - Fixup scripts