Refactored package and file names to make more sense