(Refactor) Modularize directory structure for controllers and services