Code Re-organization/Cleanup - Modularize