Modified the project structure a bit.