Code cleanup
Enumerate server files using object instead of separate variables