make file structure consistent with the "vaskos framework"