#6 Refactoring folders and exporting spottr