Refactored most methods into separate classes/modules
New folder structure for logical collection of classes and methods