Added unit tests
Cleaned up folder
Cleaned up