Organize files
Remove some warnings