changed structure and renamed files