Refactored commons to be a multi-module project