Reorganize Capistano files