Refactoring to final directory structure