Added Common Generic folder