move everything up out of dev-resources