Refractored source files to reflect new location.