Updated README, reorganised routines into relevant folders