Removing unused code, renaming files
Removing unused rest module