Updated structure and cython setup to compile without errors.