README updates, and code restructuring and updates.