Merged work:
- rearranged things for easier installation
- updated main README