Updates README
Updates README and changes the way files are included
Moves tests to root directory