modified names and updated readme to reflect new self-contained structure