cleaning code + removed unnecessary files
moved some step definitions & removed some