Cleanup, add licenses