Move capabilities and utils to new packages