Adding licence, updating readme
Code moves, cleanups