Restructure
Get rid of the guitar stuff, and reflect the changing directory structure