Made the code more structured.
Made the code more structured.
Updated readme