Organize and rename some stuff, and update README