Refactor project structure
License