Add apps directory and rearrange test directory