7810: cleaner project arrangement