Merged common source code to one file
Removed common source code