Tree structure changed
Tree structure changed
Fixed styleguide and made some minor changes