We don't need all those folders.

Fixed conventions, removed excess folders.