Fix/update/stub better project structure.