changed indents of class declarations, moved header guards to top