simplified code and fixed #35
better test structure
better files structure
Bump to version 1.0.0