Quick refactor of where stuff goes