removed unnecessary files and combined probs and types