Previous restructure was silly, improved
Updated README and INSTALL