Performed some componentization of conversion

Also changed dates for copyright and performed other refactoring bits
Made some changes to scope of some variables/methods
Updated Javadoc