Refactoring ./controllers/ -> ./lib/