Retro fit Common project

Removed the local common class and replaced it with the common project
Mark created.