Solving some naming issues. Moving a class to same file but upper case.