Added async package, began refactor to multiple files