Rename files
Delete missing file
Fixing imports
Move tabs to separate files