Renamed files, added headers and fixed test