Added SFML stuff and reorganised