Renamed some clases. Refactored.