Reorganize, and set up build task