Major re-write of project.

All files renamed and updated or deleted. Some missing that will be
added soon.