Clean up
Source files organization
Fix version
Fix a memory management oddity