Move files round to the way we organise them for tools now
Fix spacing for top tabs