Quick Re-Organization, Clean up and Refactoring. Fixed Copyright. It's MIT... so if you are reading this, go nuts.