Fixed Merge

Changed directory locations so that each of the separate branches of the
old charge repository are now changed into separate directories.