Code Re organizing