Updated readme and fixed some modularization.