Update project structure for easy package creation