Stripped out all the old files and updated the common module