Moved some packages around and edited the readme