Organize import
Update version to 0.2.4