Changed setup structure to recognize subpackages