Moved sfml code to appropriate places.
Conflict resolution.