Convert Pi version to use application modules