Modularize and updated README