Add rimraf module, neater paths

Merging this again :)