More restrucuring fixes
Merge pull request #45 from EnacheB/master

More restructuring fixes