[FIXED] Removing duplicated imports
[FIXED] Reordening project files