Files renamed, readme cleaned up, some trivial code cleanup