More sensible naming in i/o, added i/o, moved feacalc