File organization; further amd-tools 1.0 compatibility