Refactor extender project structure