Added Unit Tests and Renamed a few files