Modified the project structure