Bug 990117 - Made kits work on mobile, moved less into separate files