More folder clean up.
Removing a bunch of un used files.
Removed un-used reference.