Fabfile - small reorganization.