Changed file structure
Changed user experience, changed method name