Refactor angular module structure