Move some files out to their own projects