Added classes and interfaces and references placed