Deleted these files until they are needed.
Made minor changes to support using the DRY pattern