Add comments, rename main file