Rename main file, small changes