Move some more files to shared project