Added a license, did some reorganizing