Added classes and organized the app