Better structure. Better readme.