Renamed package to get better structure.
Restrucutred and added more tests.