Merging file and folder import as the other way was stupid
Removing accidentally committed modules