Added classes and structure