Renamed files - rearranged code