Directory tree now reflects packaging tree. Fixed issue #6.