Restructured everything a little bit. Surly buggy