Modified the project architecture