Added scene class and separated main