Add leo-commons
Refactor