refactor + switch to pscMake