Small clean up
Revert change
Rename file structure
Cucumebr test