Cleanup, rename, add license