added package naming to the classes