Refactor controlers package
Refactore lib package -> services