removed extraneous dirs, updated make targets