Reformatted package naming according to Apache naming conventions