Various updates

Updated file naming, removed license, small function name changes