Added Common folder with helper files