Add pre-requisites for pgb and change directory structure
fix tests and config