reformating package structure and some handler classes