Reorganize files
Fix requires
Version bump to 2.0.5