moved code and added output and toxin modules