Modified project structure a bit