Moved common module files to a shared location