Organizing imports, updating readme