Cleaned up files/class names