Separated templates. Removed crazy build commands