Reorganize cucumber files