Move some common files to main project