Fixed package naming
Applied Java code conventions