Removed unneeded template directory and seperated template generation based on build type