Separated all common files from the rest