Modularization

Better-written and more functionality.  New and improved!