fixing another method parens
moving files to lib
merging