Added Main class and so on