isolated directive into 3 file and realign directive code
Merge branch 'master' of https://github.com/atomicfaster/worldResidentAPS