Extract PropConf to it's own file

Refactor package names