Removed async.
Added tests and structure to the project.