[#104] move folders in keeping with 639-1

Not sure this is everything required to sort #104…