Re-arrange setup/ directory