Consolidated pillars, optimized orchestration
changed hardcodings to match rcbobs
fixed typo
Merge pull request #6 from elextro/master

Several changes