all: major reorganization of files