Modified package structure to reflect cython infrastructure