modify noe code to use common files for server side also