Structure HMVC refactoring