Renamed files
Renamed/seperated files and updated examples
Tweaked file names