refactored directory structure for easier PHeasel upgrades