Moved PropertyGroup into own targets file

In order to ensure that all settings are being respected, trying to move
propertygroup into it's own targets file