Updated package structure to conform to Java naming conventions.