Update to changelog and moving files