some refactorizations & added Readme