Organize code, update readme preview, polishing