fixed style, is now mostly conform with google c++ style
renamed some files
refactoring