Fixed template folder. Added software folder