Changed interface name
Remove classes to packages and make string constants
Remove classes to packages and make string constants