Renamed files to avoid import issues.
Problem 5 solved.