Refactoring ISA only PC code

Signed-off-by: Simarpreet Singh <simarpreet007@gmail.com>