directory structur changed and tests modified