Organize Imports
Fix #39