Added individual pxd files
Refactored to use separate pxd files instead of unified pxd