Moving code to match rest of project's setup