Nstonehouse/refactoring/include packages