Refactored package and file names to be more suitable.