Created better project structure