Renamed files and corrected functions. Numerous changes across all files