Added 2 classes and renamed main for project structure