Refactor to match standards set for where datatypes should be located.