Redid structure.
Updated README