Got the wave working
Redo directory structure