restructured, now using architecture subdirs for a start