Modularized a bit
Updated the README file