Refactor to support the build tool I made