Name changes
Moved main method to seperate class