Some clean up, reorganizing, and finalizing -- almost done with first release