Organization into proper module structure